bitkeeper revision 1.1483 (428de756rFBp-KHtm51Jw47YJiLjXA)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 20 May 2005 13:34:14 +0000 (13:34 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 20 May 2005 13:34:14 +0000 (13:34 +0000)
commit35dad279d71d8f5efa1b8b0209c115ad05656f01
tree31f1603b203d25114658eca916cc95cf4641eff7
parent044735992c3be9c0a48b87c1efdca98f363c7ae2
parent642d0333322a840e00b76522b26af65db729980a
bitkeeper revision 1.1483 (428de756rFBp-KHtm51Jw47YJiLjXA)

Manual merge.
linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h